From 3fceb353bf3191744aafceb64b6f515b66ab4561 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 23 Feb 2002 22:18:27 +0000 Subject: [PATCH] Patch from Matthias Clasen to remove some excessive ::changed signals for Sat Feb 23 16:52:38 2002 Owen Taylor * gtk/gtkentry.c: Patch from Matthias Clasen to remove some excessive ::changed signals for GtkEntry. (#53130) --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkentry.c | 21 +++++++++++---------- 8 files changed, 46 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index bee7cce8e9..df295ff52e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Feb 23 16:52:38 2002 Owen Taylor + + * gtk/gtkentry.c: Patch from Matthias Clasen to remove some + excessive ::changed signals for GtkEntry. (#53130) + 2002-02-23 Tor Lillqvist * gtk-zip.sh.in: Include the gtkrc files for themes. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index bee7cce8e9..df295ff52e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sat Feb 23 16:52:38 2002 Owen Taylor + + * gtk/gtkentry.c: Patch from Matthias Clasen to remove some + excessive ::changed signals for GtkEntry. (#53130) + 2002-02-23 Tor Lillqvist * gtk-zip.sh.in: Include the gtkrc files for themes. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bee7cce8e9..df295ff52e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sat Feb 23 16:52:38 2002 Owen Taylor + + * gtk/gtkentry.c: Patch from Matthias Clasen to remove some + excessive ::changed signals for GtkEntry. (#53130) + 2002-02-23 Tor Lillqvist * gtk-zip.sh.in: Include the gtkrc files for themes. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bee7cce8e9..df295ff52e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sat Feb 23 16:52:38 2002 Owen Taylor + + * gtk/gtkentry.c: Patch from Matthias Clasen to remove some + excessive ::changed signals for GtkEntry. (#53130) + 2002-02-23 Tor Lillqvist * gtk-zip.sh.in: Include the gtkrc files for themes. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bee7cce8e9..df295ff52e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sat Feb 23 16:52:38 2002 Owen Taylor + + * gtk/gtkentry.c: Patch from Matthias Clasen to remove some + excessive ::changed signals for GtkEntry. (#53130) + 2002-02-23 Tor Lillqvist * gtk-zip.sh.in: Include the gtkrc files for themes. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bee7cce8e9..df295ff52e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sat Feb 23 16:52:38 2002 Owen Taylor + + * gtk/gtkentry.c: Patch from Matthias Clasen to remove some + excessive ::changed signals for GtkEntry. (#53130) + 2002-02-23 Tor Lillqvist * gtk-zip.sh.in: Include the gtkrc files for themes. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bee7cce8e9..df295ff52e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sat Feb 23 16:52:38 2002 Owen Taylor + + * gtk/gtkentry.c: Patch from Matthias Clasen to remove some + excessive ::changed signals for GtkEntry. (#53130) + 2002-02-23 Tor Lillqvist * gtk-zip.sh.in: Include the gtkrc files for themes. diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index fe6efdcb85..5a847e9a88 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -1667,8 +1667,6 @@ gtk_entry_insert_text (GtkEditable *editable, strncpy (text, new_text, new_text_length); g_signal_emit_by_name (editable, "insert_text", text, new_text_length, position); - g_signal_emit_by_name (editable, "changed"); - g_object_notify (G_OBJECT (editable), "text"); if (new_text_length > 63) g_free (text); @@ -1693,8 +1691,6 @@ gtk_entry_delete_text (GtkEditable *editable, g_object_ref (G_OBJECT (editable)); g_signal_emit_by_name (editable, "delete_text", start_pos, end_pos); - g_signal_emit_by_name (editable, "changed"); - g_object_notify (G_OBJECT (editable), "text"); g_object_unref (G_OBJECT (editable)); } @@ -1898,6 +1894,9 @@ gtk_entry_real_insert_text (GtkEditable *editable, *position += n_chars; gtk_entry_recompute (entry); + + g_signal_emit_by_name (editable, "changed"); + g_object_notify (G_OBJECT (editable), "text"); } static void @@ -1926,13 +1925,15 @@ gtk_entry_real_delete_text (GtkEditable *editable, if (entry->selection_bound > start_pos) entry->selection_bound -= MIN (entry->selection_bound, end_pos) - start_pos; + /* We might have deleted the selection + */ + gtk_entry_update_primary_selection (entry); + + gtk_entry_recompute (entry); + + g_signal_emit_by_name (editable, "changed"); + g_object_notify (G_OBJECT (editable), "text"); } - - /* We might have deleted the selection - */ - gtk_entry_update_primary_selection (entry); - - gtk_entry_recompute (entry); } /* Compute the X position for an offset that corresponds to the "more important -- 2.30.2